bug fixes & presentation changes
bug fixes & presentation changes