Simplified code base... removed some unnecessary links and fields in tables, removed a database schema change... removing uncesssary features in order to eventually do a pull request.
Also, improved time management for end-time... still a bit confused.