Fixes and new code
Changes