Fixed some quick issues, more to fix though