Download code now working & many bug fixes