fixed merge issues and example program calls.