added more to user interactions and cleaned up