Undid several commits which fixed several issues.