Cleaned some things up
Everything works now