Updating to v1.2

Fixed some bad file names, unused permissions, unused code (or bad code)
and fixed a couple of bugs.