Fixes, some new code