v1

Fixed known errors. Version 1 committed!