Bugs fixed - now complete