Fixed some loading issues. Still work to be done