various cool fixes
various cool fixes