few bugs fixed, few updates