some minor changes for a better start