Minor improvements

Only had a little time to improve it today.