7f9f44d Lots of changes and fixes