I wish I didn't have to keep doing this

More minor changes