reworked some stuff.