Added spec, minor changes
Added spec, minor changes