Fixes and new entry