Folders fix and some input stuff