bug fixes and minor styling changes