Kiss!!!!! and some tweaks