Little improvements, still not ready