preparing for demo and fixin stuff