Added regular mode and other minor but fixes