Solved a couple more questions