final fixes, additions
zer0's link