If you have a few days there, take a day trip on the train to Delft, it's about an hour from Amsterdam. It's georgeous, and has the Royal Delft Porclean factory that you can tour thru. It was a highlight for my trip there. Plus the train ride thru the countryside was very scenic, windmills, etc.
We spent a few days in Delft, and went into Amsterdam on our last day. One thing in Amsterdam I wanted to do, but we didn't allow for time, was the tour boat thru the canals. It looked so relaxing.
There is a kewl shopping area, I cant' remember the street name, but there is an alley way, which has a doorway that has tipped quite a bit to the side.
Are you going see Dralion?