Fixed minor bugs && ready to push to prod