Slight changes and fixed stupid mistakes, still not usable