Committing changes to a lot of stuff

added more debug commands, as well as merged more of the UI
TODO: finalize weapon logic and fallbacks for weapons