restored loaders and some fixes