bout to merge to bug fixes