added includes and fixed lists