Revome rudiments and some fixes