Put the stuff together, and some enhancements

Merged other targets and did fixups.