added some new solutions, cleaned up older solutions