worked out all build bugs