Little improvements before BIG changes