More trash out and some bug fixes.