basic event listeners implemented; some renaming