Added some fixes and features

While flying to amsterdam! :D