Minor changes

After diving further in, ajax is not needed, however, minor bugs fixed in this branch.