General Update v2

Just another update.