Minor changes and bugs fixed