Updated to new API and closed several items