add modified mousetrap lib
simplify architecture, ginstant now works