fixed bugs with prefixes, added comments with TODOs