clean up + stderr added