Fixes, tons of fixes