cleaned up console.logs and fixed border issue