Minor changes, few bugs fixed.