More more things

# Changes
Fixes a bunch of minor issues. :athletic_shoe: