Added a cleanup initialiser. Fixes to folder limits.