Minor changes, new final build