more fixes bleh