Major Update

Many fixes and additions!