Improved comments
crash fixed on startup