Minor changes/bugs fixed.