Major bux fixes, especially on server