Updates

Cleaned manifest up,  altered a few string values, fixed state restore
bug