fixing more bugsgit add . I THINK THIS MAY BE THE LAST COMMIT FOR A WHILEEEE