fixed a bug, where long folder names cannot be parsed correctly +
cleaned up