minor changes
merged for cap fixes