Fixed some code + docblocks