Fixed all issues
YAY :D