Added custom cursor + small code updates