Fixed issues and began on more work for spigot page