fixed e
fixed cap
merged ze fix and cap fix