Updated and fixed some more issues