Finished refactoring items. Also fixed /kill command.