Bigger margins to prevent cliping.
minor enhancements