further changes to files

Updated the listener stuffs. Still untested, so no specific notes.