lots of dirty fixes
versao rc