Balance fixes and QA implementation