Working on solving problems

I have solved 2 problems, more to go. Making a commit now in case I
really screw something up.