new bits n fixes