be really strict ;o) and misc cleanup