Fixed Functions

Fixed the latest functions as well as bug fixes in previous issues in
older classes