Few fixes as reading through this....