Fixed some warnings and typos. Removed outdated TODOs.
SimpleTag: ducumentation added