Cape universal

There are several changes here I'd like you to consider.