Minor changes. Do some further testing! Do some refactoring!