Answered remaining questions and small code issues