Big updates, single and multi modes, bugs fixed