More minor touchups - still needs work