General improvement and bug fixes
Add simple contestants