Some minor bugs fixed; updated readme