Add some edits from @saduros