Feature updates bug fixes