Updates from bootz

Some new updates from bootz