Fixes + update Comments