Update - fixes and additions