Small fixes

Small fixes, corrections, updates