Update to latest version, fix a few bugs
More work on initial setup