Cleaned up schematic, fixed a minor errors, ready for layout!