initial 15

minor corrections to variables naming, and necessary includes