Slight modifications to the code

not many changes but still...