Merged my local code with this repo

some more instructions and style updates.