* bugs fixed
* structure still a little bit dirty
* will be analyzed one more time before handing over