Minor fixes but still stuck