- cleanup and slug fix