Fixes, small updates and additions