fixing some committing issues still...