some fixes, pt.1