Sake bomb phase1 improvements

Resolves #1110, #1111, #1113