minor edits and fixes

did some minor cleaning up, and moved some things around. Currently
learning up on php to see if I can use that at this point.