Maybe fixed connect problems (folder ordering, etc.)