reorganising shit + small fixes