couple bug and style fixes