Fixed some stuff for the push, hope it works somehow