Cleaned up bp's, fixed code, code now stable