added bullet and improved query performance with includes
cleaned up most n+1 querries