bugfix and add comments

uppercase issues occured