Added some more functionality, fixed some things, and changed how some stuff work