Bug fixes and impovements
:(