Basic algo changes
More basic compile fixes
More basic fixes