Bug fixes, finished basic program functions and requirements