WIP
cleanup gems'
fix demo