Fixed some little bugs and added the solutions