Fixes and add quantum