Small changes and clean ups. Hard coded stuff to come next...