Consolidation

1.0alpha1-5+debug

Tweaks

ADDITIONAL INFORMATION