Fixes, tweaking and cleaning