Minor changes, working on ant