Fixes and more code