Commented for documentation where appropriate, removed commented bits of useless/deprecated code