bug fixes and design udpates