Tweaked look and feel..
Added more error handling (basic ones anyway)