bug fixes; (almost working)