Contintued bug fixing & style improvments