Improvements

Hi, 
I played around with your code, and made some changes. 
It is quite usable now, so I replaced the good old Jd-gui to Luyten.
Try out my changes and pull/commit if you like.
Regards,
Zoltan Erdei