improvements, additions and corrections