fixed some stuff, and have no idea what the A's are
Updated stuff