2.0

Fixed various bugs.