Test new aesthetics + cleanup + code corrections