Few more minor changes, before starting testing