Added loader functionality fixed a couple errors