Numerous additions
General additions