Fix the specs mostly and some cleanup