Basically fixes a bunch of problems from V1. Also, special thanks to @theguyneverstops for basically the menu.
C2A
