Refined some cool features