cleanup, look around still shaky