Small parts, random stuff

Second PM sent. waiting on reply