fixes #120 
Better layout
Improved exception management