Added some commands, streamlined some things in the core