Various logic and code improvements, eager-loading