a lot of fixes... i should commit more often :-)