minor styling things and some bug fixes