Cleaned classes, updated messages, started development of unique markers and quick fix.
Implemented limit expression input