Fixes and added