fixes and extending