add comment + fix castle