Harbour + Lots of fixes and additions