some fixes still broken