Initial commit
Various changes and updates