Large changes any files. Fixed #99 Fixed #79 Fixed #93