commit after fixes after testing