fixed stuff + v30 version