updating, still broken stuff