Some small changes, bug fixes (linux based) and notes