Minor improvements - First production ready install