Fixes and a new dict