minor hacks, still broken