removed unused code
refactoring of some variables names
*** empty log message ***
added some targets
fixed some Swing Bugs
added OI