Version 2.5.1 Minor Fixies

Minor fix and more code convensions.