Bugs fixed, prefinal changes done