smore tweaks. still not complete