brushing up demo code
added TODO item
fixed some pod errors