bug fixes and front-end changes