some cool improvements