Forgot to Pull first. Fixed bugs.