Many changes made: See step-6 in info/Project-Steps.txt