added action mapping
fixed examples and cleaned up validation