Solved some minor bugs && pushing new version to production