Bugfixes and refinements

- Fixed (not really working) recognition of networks
- some small refinements
- removed debug-windows popping up all over the place
- Added comments for the macros including descriptions