Functionality and bug fixes and some styling.