Bug fixes, still so crash-y