Bug fixes and beginning of Senate phase !