last commit bug fixes