refactor and bugfix
moar updates
update for new parus_major options