Changes here and there

Just a few changes here and there