quiz is working (but extremely ugly)
merge and update features