Implemented bug fixes after testing