fixes

too many to mention