scheduled cleanup, many fixes