remember fixed buttons
some minor fixes
initial checkin of demo