Added common sense upper bounds
Add upper bounds
Remove module line in headers
Updated copyright