fix exception rescue and ls more stuff