Various cleanup things
Work on re-implementing guns