various fixes not ready for push
slight changes