most bugs fixed