removed loader, fixed build from vs #2