Various fixes & changes
Various changes