last fixes of course project