error handling, loading, fixes