bugfixes for accordion usage, timer bugs, cleanup