BF: Fixing some minor problems
BF: prevent stripping of spaces in solution + some new tasks