Changes/fixes/additions/deletions to VPS creation code