commented exception handling
fixed borders, added Listeners