bug fixes
styles and stuffs