more stuff for v3 and cleaned gui