minor fixes, init still broken