clenaed up and no known bugs