cleaned up several bugs