adding status and fixing cleanup