Multiple bug fixes, changed file manager