fixed e
merged ze fix and cap fix
added Caps