Fixing some small things

Almost there!