Updates for Amsterdam for @pedro, with some stuff from @Juice10. :v: