Fix the version problems and other misc. stuff
Tons of changes and improvements