Major Updates

Some big updates from the initial release that had a few bugs.