continued development - major bug fixes