small changes, can now compile