Incorporated blaknite's changes
Updated docs and incorporated even more changes