Initial commit
Various changes/fixes/updates.