Commands are better, just general fixes I forgot