added some fixes and puploader