FIXED: controls parsing
ADDED: error messages
ADDED: unit tests