finished.. hope it still works
Fixed broken bits