Adding new solutions and some fixes