v.1.0.1 Small clean-ups and updates