fixed warnings, also REGISTERED THIS DAMN LISTENER