minor fixes, still broken however