code cleanup, ask about a sigint, more questions