Updated various stuff

Some important edits by GliGli