random fixes + improvements