tweaks
Adds comments and makes some naming tweaks
updates build