If you have special interests besides history during your visit to Amsterdam, don't hesitate to ask. The best advisor is a local.
And it's free :-)
Public transport here
For books: here
If you need food, clothes or forgot your razor or bike : here
If your glasses are broken: http://www.vroomennobbe.nl (they are ready the next day!)
I recommend that you book your Anne Frank tickets online here.
Some other history ideas in Amsterdam:
And if you have enough of history:
On Saturday morning there is a organic farmers market on Noordermarkt.
On Wednesday there is a is a organic farmers market on Haarlemmerplein.
On week days (and on Saturday), there is a big street market on the Albert Cuypstraat.
There is a lot to see/eat/drink!