another bugfix
another bugfix
cleaned main file a bit