refactor
merge makeVar
fix binaries names