Minor fixes and a Spring cleaning performed.