Solved #46, #47, and #50