fixing up some space consistancies