Todo's and fixed some loading errors