Added way more stuff and fixed docblocks