Add PoSh functionality and cleanup misc items