update, fixes and bugs