Changed some stuff, bug fixes

As it stands, everything is functionally complete and useable.