Major improvements

Using advanced theoretical results.