Code is prototyped and fixed bugs