Bugfixes, Removed trial counter

Various Bugfixes due to the rewrite were fixed. Due to an error in the
model file (which is yet to be sorted out) the timer and related
indicator of trial number have been temporarily disabled.