Cleaned up getting bounds. Should be right no matter what now
Fixed build for classic
fixed unified output