code cleaning, layout improvements, some bugs, ...