A few changes to the main interface
resolved mere and style conflicts