commented the annoying load and fixed some bugs