Fixed/added a variety of things... will be detailed in issues