Final

fixed comments and functions