last fixes before cutting to rails