Major updates, removed unnecessary items etc.