major bug fixed
more bug fixes