timer done
Bug Fixes