abstract fixes and changes