Bug Fixes, works start to finish