renamed a couple of files and functions for clarity..
made some minor insignificant changes..