slight bug fixes