initial fixes, wrote features