Contest Submittal Version

Bug fixes, few more polish tweaks and adjustments