Few changes and fixes, new cmd options