minor stuff, still broken