Fixed minor bugs

Made changes previously discussed