cleanup fix etc