added todo's
updated mappings; added plugins;