minor modifications, bit improved parser