wooo more bug fixes