Open folder, some bug fixes