some stuff; fixes + preparing