fixes and added assignments