fixing stuff
tests passing, features more or less table