Removed a couple bugs