Updated Source

Fixed minor bugs and issues with the code. May need more work, but for
now looking better.