Adjust a few things

Hey Eric, can you check this out?