Fixes, fixes, fixes, and additions!