Fixes, additions and code insertations.