Some small changes, just commiting before bed