Fixed various issues after testing on Sake