bug fixing js etc.