Fixes and additions!